More groundwork for class-typed time primitives in waypoint.

Better types for vecs lookup functions.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4257 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index ccf47089e77885c00e8212ba61580397e706f23b..a57657b42f0fcd7f4e930463ee3ec84ac53717cd 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -438,7 +438,11 @@ public:
   url(NULL), 
   url_link_text(NULL), 
   icon_descr(NULL), 
+#if NEWTIME
+//  creation_time(QDateTime::fromTime_t(0)),
+#else
   creation_time(0), 
+#endif
   microseconds(0), 
   route_priority(0), 
   hdop(0), 
@@ -891,7 +895,7 @@ void is_fatal(const int condition, const char*, ...) PRINTFLIKE(2, 3);
 void warning(const char*, ...) PRINTFLIKE(1, 2);
 void debug_print(int level, const char* fmt, ...) PRINTFLIKE(2,3);
 
-ff_vecs_t* find_vec(char* const, char**);
+ff_vecs_t* find_vec(const char*, char**);
 void assign_option(const char* vecname, arglist_t* ap, const char* val);
 void disp_vec_options(const char* vecname, arglist_t* ap);
 void disp_vecs(void);

diff --git a/gpsbabel/vecs.cc b/gpsbabel/vecs.cc
index c0617e4d572bb56effe351f20df7a0ad46837c08..3ad0b5d697029276dca98555594a453014e84966 100644 (file)
--- a/gpsbabel/vecs.cc
+++ b/gpsbabel/vecs.cc
@@ -1122,7 +1122,7 @@ exit_vecs(void)
 void
 assign_option(const char *module, arglist_t *ap, const char *val)
 {
-  char *c;
+  const char *c;
 
   if (ap->argval == NULL) {
     fatal("%s: No local variable defined for option \"%s\"!", module, ap->argstring);
@@ -1220,7 +1220,7 @@ disp_vec_options(const char *vecname, arglist_t *ap)
 }
 
 ff_vecs_t *
-find_vec(char *const vecname, char **opts)
+find_vec(const char *const vecname, char **opts)
 {
   vecs_t *vec = vec_list;
   style_vecs_t *svec = style_list;